Pass a GdkDragAction to gtk_drag_get_cursor. (#309784, Sebastian Bacher)

2005-07-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to
	gtk_drag_get_cursor.  (#309784, Sebastian Bacher)

diff --git a/ChangeLog b/ChangeLog
index e1ae1b07c7b82601af51ab75c86c12c20bf750f8..e34ac3f657ca63740dff122e852e8f3d565a958c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to
+       gtk_drag_get_cursor.  (#309784, Sebastian Bacher)
+
 2005-07-08  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkfilesel.c: Use g_get_host_name().

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1ae1b07c7b82601af51ab75c86c12c20bf750f8..e34ac3f657ca63740dff122e852e8f3d565a958c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-07-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to
+       gtk_drag_get_cursor.  (#309784, Sebastian Bacher)
+
 2005-07-08  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkfilesel.c: Use g_get_host_name().

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e1ae1b07c7b82601af51ab75c86c12c20bf750f8..e34ac3f657ca63740dff122e852e8f3d565a958c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-07-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkdnd.c (gtk_drag_update_cursor): Pass a GdkDragAction to
+       gtk_drag_get_cursor.  (#309784, Sebastian Bacher)
+
 2005-07-08  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkfilesel.c: Use g_get_host_name().

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index a8eb78c4ac79fbde1b7ffef5912145dad7563570..4bd273939014f289c76439250c098d6ce6336f6d 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -749,7 +749,7 @@ gtk_drag_update_cursor (GtkDragSourceInfo *info)
     return;
 
   cursor = gtk_drag_get_cursor (gdk_cursor_get_display (info->cursor), 
-                               i, info);
+                               drag_cursors[i].action, info);
   
   if (cursor != info->cursor)
     {